From 715012329f9aa175457ff1b6f9b121eaf5f8c715 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Thu, 12 May 2005 22:03:23 +0000 Subject: [PATCH] bitkeeper revision 1.1389.1.55 (4283d2abTQukZce4qzwxx1FWqaoLXQ) page.h, init.c: phys is machine physical already. So we shouldn't try to convert guest physical to machine physical. Signed-off-by: Arun Sharma Signed-off-by: Christian Limpach --- linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c | 4 ++-- linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c b/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c index d50d2218e1..c43d567c5b 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c +++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c @@ -328,11 +328,11 @@ static void set_pte_phys_ma(unsigned long vaddr, } } - new_pte = pfn_pte(phys >> PAGE_SHIFT, prot); + new_pte = pfn_pte_ma(phys >> PAGE_SHIFT, prot); pte = pte_offset_kernel(pmd, vaddr); if (!pte_none(*pte) && - pte_val(*pte) != (pte_val(new_pte) & __supported_pte_mask)) + pte_val_ma(*pte) != (pte_val_ma(new_pte) & __supported_pte_mask)) pte_ERROR(*pte); /* diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h index 451fb11bb8..8acd7990dc 100644 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h @@ -92,6 +92,7 @@ typedef struct { unsigned long pgprot; } pgprot_t; #define pte_val(x) (((x).pte & 1) ? machine_to_phys((x).pte) : \ (x).pte) +#define pte_val_ma(x) ((x).pte) static inline unsigned long pmd_val(pmd_t x) { -- 2.30.2